From d81a1d35a9b1e49eb6037249a6501f9610a96e48 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 22 Jan 2008 10:18:58 +0000 Subject: [PATCH] XEN_GUEST_HANDLE_00030205() compat macro is broken. Remove it and open-code an alternative at its two invocation sites. Based on a patch by Jan Beulich. Signed-off-by: Keir Fraser --- xen/include/public/physdev.h | 6 +++++- xen/include/public/xen-compat.h | 7 ------- xen/include/public/xen.h | 6 +++++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/xen/include/public/physdev.h b/xen/include/public/physdev.h index c5d1ebd519..75990545b2 100644 --- a/xen/include/public/physdev.h +++ b/xen/include/public/physdev.h @@ -81,7 +81,11 @@ DEFINE_XEN_GUEST_HANDLE(physdev_set_iopl_t); #define PHYSDEVOP_set_iobitmap 7 struct physdev_set_iobitmap { /* IN */ - XEN_GUEST_HANDLE_00030205(uint8) bitmap; +#if __XEN_INTERFACE_VERSION__ >= 0x00030205 + XEN_GUEST_HANDLE(uint8) bitmap; +#else + uint8_t *bitmap; +#endif uint32_t nr_ports; }; typedef struct physdev_set_iobitmap physdev_set_iobitmap_t; diff --git a/xen/include/public/xen-compat.h b/xen/include/public/xen-compat.h index f0e70dddbe..c9f369f0e9 100644 --- a/xen/include/public/xen-compat.h +++ b/xen/include/public/xen-compat.h @@ -41,11 +41,4 @@ #error "These header files do not support the requested interface version." #endif -/* Fields defined as a Xen guest handle since 0x00030205. */ -#if __XEN_INTERFACE_VERSION__ >= 0x00030205 -#define XEN_GUEST_HANDLE_00030205(type) XEN_GUEST_HANDLE(type) -#else -#define XEN_GUEST_HANDLE_00030205(type) type * -#endif - #endif /* __XEN_PUBLIC_XEN_COMPAT_H__ */ diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index a3b1d2fc3f..cce6086062 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -263,7 +263,11 @@ struct mmuext_op { /* SET_LDT */ unsigned int nr_ents; /* TLB_FLUSH_MULTI, INVLPG_MULTI */ - XEN_GUEST_HANDLE_00030205(void) vcpumask; +#if __XEN_INTERFACE_VERSION__ >= 0x00030205 + XEN_GUEST_HANDLE(void) vcpumask; +#else + void *vcpumask; +#endif } arg2; }; typedef struct mmuext_op mmuext_op_t; -- 2.30.2